From: Grzegorz Jaszczyk Date: Thu, 12 Jul 2018 05:40:34 +0000 (+0200) Subject: mvebu: cp110: align all comphy_index arguments type X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=f858e989c607fca1d76207f4c918e82dac1c7221;p=project%2Fbcm63xx%2Fatf.git mvebu: cp110: align all comphy_index arguments type The biggest comphy index can be equal to 6 so there is no need to use uint64_t for storing it. Change-Id: I14c2b68e51678a560815963c72aed0c37068f926 Signed-off-by: Grzegorz Jaszczyk Reviewed-by: Igal Liberman Reviewed-by: Kostya Porotchkin --- diff --git a/drivers/marvell/comphy/phy-comphy-cp110.c b/drivers/marvell/comphy/phy-comphy-cp110.c index 8b78280b..326d5a85 100644 --- a/drivers/marvell/comphy/phy-comphy-cp110.c +++ b/drivers/marvell/comphy/phy-comphy-cp110.c @@ -2201,7 +2201,7 @@ int mvebu_cp110_comphy_digital_reset(uint64_t comphy_base, return 0; } -int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index, +int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint8_t comphy_index, uint64_t comphy_mode) { int mode = COMPHY_GET_MODE(comphy_mode); @@ -2247,7 +2247,7 @@ int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index, err = mvebu_cp110_comphy_ap_power_on(comphy_base, comphy_index); break; default: - ERROR("comphy%lld: unsupported comphy mode\n", comphy_index); + ERROR("comphy%d: unsupported comphy mode\n", comphy_index); err = -EINVAL; break; } @@ -2257,7 +2257,7 @@ int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index, return err; } -int mvebu_cp110_comphy_power_off(uint64_t comphy_base, uint64_t comphy_index) +int mvebu_cp110_comphy_power_off(uint64_t comphy_base, uint8_t comphy_index) { uintptr_t sd_ip_addr, comphy_ip_addr; uint32_t mask, data; diff --git a/drivers/marvell/comphy/phy-comphy-cp110.h b/drivers/marvell/comphy/phy-comphy-cp110.h index ada6aeca..2461e5ca 100644 --- a/drivers/marvell/comphy/phy-comphy-cp110.h +++ b/drivers/marvell/comphy/phy-comphy-cp110.h @@ -8,11 +8,11 @@ /* Marvell CP110 SoC COMPHY unit driver */ int mvebu_cp110_comphy_is_pll_locked(uint64_t comphy_base, - uint64_t comphy_index); + uint8_t comphy_index); int mvebu_cp110_comphy_power_off(uint64_t comphy_base, - uint64_t comphy_index); + uint8_t comphy_index); int mvebu_cp110_comphy_power_on(uint64_t comphy_base, - uint64_t comphy_index, uint64_t comphy_mode); + uint8_t comphy_index, uint64_t comphy_mode); int mvebu_cp110_comphy_xfi_rx_training(uint64_t comphy_base, uint8_t comphy_index); int mvebu_cp110_comphy_digital_reset(uint64_t comphy_base, uint8_t comphy_index,